25c432
@@ -26,6 +26,7 @@
import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.Server;
 import org.apache.hadoop.hbase.master.MasterServices;
+import org.apache.hadoop.hbase.util.Bytes;
 
 public class ModifyTableHandler extends TableEventHandler {
   private final HTableDescriptor htd;
@@ -35,6 +36,10 @@
public class ModifyTableHandler extends TableEventHandler {
       final MasterServices masterServices) throws IOException {
     super(EventType.C_M_MODIFY_TABLE, tableName, server, masterServices);
     this.htd = htd;
+    if (!Bytes.equals(tableName, htd.getName())) {
+      throw new IOException("TableDescriptor name & tableName must match: " 
+          + htd.getNameAsString() + " vs " + Bytes.toString(tableName));
+    }
   }
 
   @Override
@@ -52,4 +57,4 @@
public class ModifyTableHandler extends TableEventHandler {
     }
     return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr;
   }
-}
\ No newline at end of file
+}
